Auto merge of #2209 - felixc:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 14 Dec 2015 18:37:03 +0000 (18:37 +0000)
committerbors <bors@rust-lang.org>
Mon, 14 Dec 2015 18:37:03 +0000 (18:37 +0000)
commit21acd767c5f04d006df2d3a4055ccd27b5e8757f
tree6fac2ad1afed86c09db99c6e6bca6eff630bde59
parentdd32072f5e51c63f2caf1488325c69b2facab2ca
parentb65be0f86d50d284a879cf7a934d402d99db0cb5
Auto merge of #2209 - felixc:master, r=alexcrichton